From 81da0b86f362473498509c546edd6eab0939c0c6 Mon Sep 17 00:00:00 2001 From: Lapo Calamandrei Date: Thu, 24 Dec 2015 00:02:12 +0100 Subject: [PATCH] Adwaita: fix notebook close button --- gtk/theme/Adwaita/_common.scss | 7 +++---- gtk/theme/Adwaita/gtk-contained-dark.css | 16 +++++++--------- gtk/theme/Adwaita/gtk-contained.css | 16 +++++++--------- 3 files changed, 17 insertions(+), 22 deletions(-) diff --git a/gtk/theme/Adwaita/_common.scss b/gtk/theme/Adwaita/_common.scss index 0b2ce710fa..6f012029ff 100644 --- a/gtk/theme/Adwaita/_common.scss +++ b/gtk/theme/Adwaita/_common.scss @@ -1833,7 +1833,9 @@ notebook { color: $fg_color; &:backdrop { color: $backdrop_fg_color; } } - button { //tab close button + button.flat { //tab close button + min-height: 18px; + min-width: 18px; padding: 0; border: 1px solid transparent; @extend %undecorated_button; @@ -1853,9 +1855,6 @@ notebook { color: transparentize($backdrop_fg_color,0.7); border-color: transparent; } - & > image { // this is a hack which makes tabs grow - padding: 2px; - } } } } diff --git a/gtk/theme/Adwaita/gtk-contained-dark.css b/gtk/theme/Adwaita/gtk-contained-dark.css index e3bc115fec..cb323bdf20 100644 --- a/gtk/theme/Adwaita/gtk-contained-dark.css +++ b/gtk/theme/Adwaita/gtk-contained-dark.css @@ -1219,7 +1219,7 @@ modelbutton.flat, .menuitem.button.flat:backdrop:hover, button:link, headerbar button.titlebutton:link, .titlebar button.titlebutton:link, button:visited, headerbar button.titlebutton:visited, .titlebar button.titlebutton:visited, button:link:hover, button:link:active, button:link:checked, button:visited:hover, button:visited:active, button:visited:checked, button:link:backdrop, button:visited:backdrop, menu arrow, -.menu arrow, notebook tab button, notebook tab headerbar button.titlebutton, headerbar notebook tab button.titlebutton, +.menu arrow, notebook tab button.flat, notebook tab button.sidebar-button, notebook tab headerbar button.titlebutton, headerbar notebook tab button.titlebutton, notebook tab .titlebar button.titlebutton, .titlebar notebook tab button.titlebutton, calendar.button, calendar.button:hover, calendar.button:backdrop, calendar.button:insensitive, .scale-popup button:hover, .scale-popup button:backdrop, .scale-popup button:backdrop:hover, .scale-popup button:backdrop:insensitive { border-color: transparent; @@ -2423,15 +2423,17 @@ notebook { color: #eeeeec; } notebook tab:active label:backdrop { color: #949796; } - notebook tab button, notebook tab headerbar button.titlebutton, headerbar notebook tab button.titlebutton, + notebook tab button.flat, notebook tab button.sidebar-button, notebook tab headerbar button.titlebutton, headerbar notebook tab button.titlebutton, notebook tab .titlebar button.titlebutton, .titlebar notebook tab button.titlebutton { + min-height: 18px; + min-width: 18px; padding: 0; border: 1px solid transparent; -gtk-icon-shadow: none; transition: none; color: rgba(238, 238, 236, 0.3); } - notebook tab button:hover, + notebook tab button.flat:hover, notebook tab button.sidebar-button:hover, notebook tab headerbar button.titlebutton:hover, headerbar notebook tab button.titlebutton:hover, notebook tab .titlebar button.titlebutton:hover, .titlebar notebook tab button.titlebutton:hover { color: #eeeeec; @@ -2450,7 +2452,7 @@ notebook { box-shadow: inset 0 1px rgba(255, 255, 255, 0.05); background-image: none; box-shadow: none; } - notebook tab button:active, + notebook tab button.flat:active, notebook tab button.sidebar-button:active, notebook tab headerbar button.titlebutton:active, headerbar notebook tab button.titlebutton:active, notebook tab .titlebar button.titlebutton:active, .titlebar notebook tab button.titlebutton:active { color: #eeeeec; @@ -2460,15 +2462,11 @@ notebook { text-shadow: 0 -1px rgba(0, 0, 0, 0.89176); -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.89176); box-shadow: inset 0 2px 1px -2px rgba(0, 0, 0, 0.6); } - notebook tab button:backdrop, + notebook tab button.flat:backdrop, notebook tab button.sidebar-button:backdrop, notebook tab headerbar button.titlebutton:backdrop, headerbar notebook tab button.titlebutton:backdrop, notebook tab .titlebar button.titlebutton:backdrop, .titlebar notebook tab button.titlebutton:backdrop { color: rgba(148, 151, 150, 0.3); border-color: transparent; } - notebook tab button > image, notebook tab headerbar button.titlebutton > image, headerbar notebook tab button.titlebutton > image, - notebook tab .titlebar button.titlebutton > image, - .titlebar notebook tab button.titlebutton > image { - padding: 2px; } /************** * Scrollbars * diff --git a/gtk/theme/Adwaita/gtk-contained.css b/gtk/theme/Adwaita/gtk-contained.css index 5f20ff66a2..17aaaf41f1 100644 --- a/gtk/theme/Adwaita/gtk-contained.css +++ b/gtk/theme/Adwaita/gtk-contained.css @@ -1219,7 +1219,7 @@ modelbutton.flat, .menuitem.button.flat:backdrop:hover, button:link, headerbar button.titlebutton:link, .titlebar button.titlebutton:link, button:visited, headerbar button.titlebutton:visited, .titlebar button.titlebutton:visited, button:link:hover, button:link:active, button:link:checked, button:visited:hover, button:visited:active, button:visited:checked, button:link:backdrop, button:visited:backdrop, menu arrow, -.menu arrow, notebook tab button, notebook tab headerbar button.titlebutton, headerbar notebook tab button.titlebutton, +.menu arrow, notebook tab button.flat, notebook tab button.sidebar-button, notebook tab headerbar button.titlebutton, headerbar notebook tab button.titlebutton, notebook tab .titlebar button.titlebutton, .titlebar notebook tab button.titlebutton, calendar.button, calendar.button:hover, calendar.button:backdrop, calendar.button:insensitive, .scale-popup button:hover, .scale-popup button:backdrop, .scale-popup button:backdrop:hover, .scale-popup button:backdrop:insensitive { border-color: transparent; @@ -2429,15 +2429,17 @@ notebook { color: #2e3436; } notebook tab:active label:backdrop { color: #8b8e8f; } - notebook tab button, notebook tab headerbar button.titlebutton, headerbar notebook tab button.titlebutton, + notebook tab button.flat, notebook tab button.sidebar-button, notebook tab headerbar button.titlebutton, headerbar notebook tab button.titlebutton, notebook tab .titlebar button.titlebutton, .titlebar notebook tab button.titlebutton { + min-height: 18px; + min-width: 18px; padding: 0; border: 1px solid transparent; -gtk-icon-shadow: none; transition: none; color: rgba(46, 52, 54, 0.3); } - notebook tab button:hover, + notebook tab button.flat:hover, notebook tab button.sidebar-button:hover, notebook tab headerbar button.titlebutton:hover, headerbar notebook tab button.titlebutton:hover, notebook tab .titlebar button.titlebutton:hover, .titlebar notebook tab button.titlebutton:hover { color: #2e3436; @@ -2456,7 +2458,7 @@ notebook { box-shadow: inset 0 1px white; background-image: none; box-shadow: none; } - notebook tab button:active, + notebook tab button.flat:active, notebook tab button.sidebar-button:active, notebook tab headerbar button.titlebutton:active, headerbar notebook tab button.titlebutton:active, notebook tab .titlebar button.titlebutton:active, .titlebar notebook tab button.titlebutton:active { color: #2e3436; @@ -2466,15 +2468,11 @@ notebook { text-shadow: 0 1px rgba(255, 255, 255, 0.76923); -gtk-icon-shadow: 0 1px rgba(255, 255, 255, 0.76923); box-shadow: inset 0 2px 1px -2px rgba(0, 0, 0, 0.6); } - notebook tab button:backdrop, + notebook tab button.flat:backdrop, notebook tab button.sidebar-button:backdrop, notebook tab headerbar button.titlebutton:backdrop, headerbar notebook tab button.titlebutton:backdrop, notebook tab .titlebar button.titlebutton:backdrop, .titlebar notebook tab button.titlebutton:backdrop { color: rgba(139, 142, 143, 0.3); border-color: transparent; } - notebook tab button > image, notebook tab headerbar button.titlebutton > image, headerbar notebook tab button.titlebutton > image, - notebook tab .titlebar button.titlebutton > image, - .titlebar notebook tab button.titlebutton > image { - padding: 2px; } /************** * Scrollbars * -- 2.30.2